bitkeeper revision 1.1619.1.2 (429ce59cTt9KxcOT0JuoCYbuDDPRFw)

Many files:
  Don't include xen/slab.h and xen/domain.h at the _END_ of xen/sched.h.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
index 1d42756dc1333909a90bc7a2cb0ed2a8cd114e12..13c8d97915a9d253ff7587b8e4cd3d9da1beaeaa 100644 (file)
--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -3,6 +3,7 @@
 #include <xen/kernel.h>
 #include <xen/string.h>
 #include <xen/init.h>
+#include <xen/cache.h>
 #include <xen/slab.h>
 #include <xen/acpi.h>
 #include <asm/io.h>

diff --git a/xen/arch/x86/mtrr/main.c b/xen/arch/x86/mtrr/main.c
index 50c2f428b47000b5599821a2fb3f43483b9fc88d..48ea94ae1f767c56593964b456184f3716d50797 100644 (file)
--- a/xen/arch/x86/mtrr/main.c
+++ b/xen/arch/x86/mtrr/main.c
@@ -33,7 +33,7 @@
 
 #include <xen/config.h>
 #include <xen/init.h>
-#include <xen/slab.h>
+#include <xen/lib.h>
 #include <xen/smp.h>
 #include <xen/spinlock.h>
 #include <asm/mtrr.h>

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index ecfc988f057727e04e053accaad6d50b390a4644..5a6221c05d1d5590a7094a34b2fd59a7a92fc63c 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -3,6 +3,7 @@
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
+#include <xen/domain.h>
 #include <xen/serial.h>
 #include <xen/softirq.h>
 #include <xen/acpi.h>

diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
index 20cef35e29ec1c8d0303775e15d3d5ac346a9962..1e5bcf5cf81610783920214d6bde70d5d8b1133f 100644 (file)
--- a/xen/common/dom0_ops.c
+++ b/xen/common/dom0_ops.c
@@ -12,6 +12,7 @@
 #include <xen/mm.h>
 #include <public/dom0_ops.h>
 #include <xen/sched.h>
+#include <xen/domain.h>
 #include <xen/event.h>
 #include <asm/domain_page.h>
 #include <xen/trace.h>

diff --git a/xen/common/domain.c b/xen/common/domain.c
index 0cb93a8f360997bba30e8956da5b86c59b189f29..72b374e75177e7814f3be712b32c82463ffc531e 100644 (file)
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -10,6 +10,7 @@
 #include <xen/sched.h>
 #include <xen/errno.h>
 #include <xen/sched.h>
+#include <xen/domain.h>
 #include <xen/mm.h>
 #include <xen/event.h>
 #include <xen/time.h>

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index 4bf52e43ff969ecd6f27562523d3f1ee5cd8205d..97467983dee7afaae4719b96cf93a66ea5319f0f 100644 (file)
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -26,6 +26,7 @@
 #define GRANT_DEBUG_VERBOSE 0
 
 #include <xen/config.h>
+#include <xen/lib.h>
 #include <xen/sched.h>
 #include <xen/shadow.h>
 #include <xen/mm.h>

diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c
index 34f9fd9291c6994062c2d65230e45856a551556b..a40cea65bcfb47528b6908f3402e8bc99700e019 100644 (file)
--- a/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@ -10,6 +10,7 @@
 #include <xen/serial.h>
 #include <xen/sched.h>
 #include <xen/softirq.h>
+#include <xen/domain.h>
 #include <asm/debugger.h>
 
 #define KEY_MAX 256

diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index 672abaffd4ddfeda7c083504501b21f4a0b273b0..1e5df627d1a34125a6f61880905510338e7c17aa 100644 (file)
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -26,6 +26,7 @@
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
+#include <xen/domain.h>
 #include <xen/delay.h>
 #include <xen/event.h>
 #include <xen/time.h>

diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h
index 719e0f0d4fcde9e8b1cdaaaa14b56b035c71d0ec..367456e99ea7833d64f85adac5c3f486bf3d5c21 100644 (file)
--- a/xen/include/xen/lib.h
+++ b/xen/include/xen/lib.h
@@ -5,6 +5,7 @@
 #include <stdarg.h>
 #include <xen/config.h>
 #include <xen/types.h>
+#include <xen/slab.h>
 #include <xen/string.h>
 
 #define BUG() do {                                     \

diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 3c073f7d63855cac051546dc991ef3b20132152e..0462fda5c1011f516594879b9b1e139fa5ae3d91 100644 (file)
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -409,9 +409,6 @@ static inline void exec_domain_unblock(struct exec_domain *ed)
 
 #define VM_ASSIST(_d,_t) (test_bit((_t), &(_d)->vm_assist))
 
-#include <xen/slab.h>
-#include <xen/domain.h>
-
 #endif /* __SCHED_H__ */
 
 /*

diff --git a/xen/include/xen/slab.h b/xen/include/xen/slab.h
index a3a7daf7d6e25a4a7e944fbff71b42beef724a21..4736dede90da60225e6a3d5cf46f785ee1f8fc64 100644 (file)
--- a/xen/include/xen/slab.h
+++ b/xen/include/xen/slab.h
@@ -2,9 +2,6 @@
 #ifndef __SLAB_H__
 #define __SLAB_H__
 
-#include <xen/config.h>
-#include <xen/mm.h>
-
 /* Allocate space for typed object. */
 #define xmalloc(_type) ((_type *)_xmalloc(sizeof(_type), __alignof__(_type)))